Bugs when preparing moving..