Fix issue 158 for mturilli