moving fixes