Merge "Fix menu crash"