properly (i.e. doesn't crash or output the wrong results)

--HG--
extra : convert_revision : svn%3Afdd8eb12-d10e-0410-9acb-85c331704f74/trunk%403872