Fixed load time bug