Issue 436

Fixes issue #436