fixed issue with comparison handling (hack ...)