Solve menu issue