Use a better test for non-binary