Even better menu fix