Fixed lazy bug