Bugfix on the lazy load