fixes issue 218
Merge pull request #238 from niphlod/issue/218

fixes issue 218