temporary workaround
Merge pull request #612 from MartijnR/master

temporary workaround