Hotfix fix lazy loading

Fixes #166. 
Only took 24 days X_X
commit messages have the full story