Not the first time this has happened, simplest rule change fixes everything.