fixed move functions