Improve #65 to better match SQL behaviour