Temp fixing the partial loader for internal use