Fixed repositioning with new API