IM: #navigator fixed