Fixed menu clicking (it broke with the previous merge.)