Fix repositioning