Formation Move Fix