fixed def loader