finally fix loader