Update to fix menu problem