#233 more mode checks