Bug fix for ease of navigation