Number-is-single fixes
Merge pull request #502 from wivlaro/number-is-single-fixes

Number-is-single fixes