Fixes issue #2037 

Fixes issue #2037