Merge pull request #3499 from StevenPuttemans:fix_2432