#184 Strict branching