fixed 2 critical laziness bugs