Fix for weird lazy loading issues