Removed changes from #573 because they break the menu