Fix for ResourceLoader