fix loader and associated test