issue with menu improvement #124
Fix issue with menu #124