Small adaption on pull-request #27