Better cursor (see issue #62)