Fix #115 again, including if you don't pick anything from the menu.