Additional fix for reposition