attempt to fix lazyloading - failed for now