Fix #1 - Fix lazy loading
Merge pull request #2 from dhoko/ag_#1_lazyfix

Fix #1 - Fix lazy loading