final 2.2 menu fix