Fix move simulator