Fixes issue #2001 

Fixes issue #2001