loading fix in batarang (but still buggy)