Fix hotfix revsersion on 5c5210616d7be7f9633

There were some misplaced ANDs.  I cleaned it
up a bit and added the missing one.

Fix #238