an attempt at addressing loader madness... #1364