Fix issue3

EJ and/or Remco, can you take a look at this?