Fix navigating away unassignment