Robustified current home position setup