Workaround for bug occuring in a bit older version that the latest (wrong menu displayed)
Workaround phase 2