Fixed lazy initialization