Fixes issue #492

Fixes issue #492