Fixed loader bug