Fixed lazy issue #2 fix.