Fixed lazy load bug.
Updated for 1.3.9.