bugfix for navigation changes