Menu generation fix