passing tests, more sturdy check
v2.0.4