Properly handle moving issue
epic