fix moving bugs