Fix for loader