hackfix for 18
Merge pull request #62 from BillMills/master

hackfix for 18