fix issue #11
fix useless use of string equality check