try to fix #559
Merge pull request #596 from michael-heerdegen/fix-559

try to fix #559