Bug fix for the conflic that appears with the navigation