Added Ulrich's menu fix