Corrected bugs for limit evaluation