Merge pull request #3844 from Safety0ff/wconv

Fix comparisons functions