Border move fix