Return to home work-around