Fixing a load-time bug