re-fix #243 checking for '\0' made the whole check pointless. Now it should actually...