Lazy loading is broken

[wuweiweiwu]

c844c04#r29717312

[HgAlexx]

Any chance to get this fixed ?

[wuweiweiwu]

@HgAlexx ill try to get to it asap but feel free to contribute

[HgAlexx]

It took some time but I find time to do the associated pull request: #461