Fix for "stay in place" mode