Applied fix mentioned in bugreport 3370. Seems to solve the issue.
Merge pull request #1844 from StevenPuttemans:bugfix_3370