Issue#300

Fixes issue #300