Fixed scoping issues with both eval calls.