Applied lazyload. Fixed #2