Bug fix regarding lazy loading