Fixed loader/loading bug