fix for lazy load troubles