Fixed solution after move