Merge pull request #2278 from benthecarman/faster-u16-check