Move nags and move number fix