re #138 - fixed as discussed with Johan and Ercan