[[ Bug 14155 ]] Fix to the Menu Builder
Merge pull request #15 from runrev/bugfix-14155

[[ Bug 14155 ]] Fix to the Menu Builder