fixed invalidateOptionsMenu() calls