Issue #669, #668 - Adding back requires_one_of call which was accidenly removed in previous commit.