Merge pull request #1538 from StevenPuttemans:bugfix_3283