Temporary menu bug work around fix applied try 2.