Fix issue with menu value overriding