Fix #1 - Fix lazy loading