Use lambda capture to avoid duplicating code

Use lambda capture to avoid duplicating code #780