Fixed mov bugs