Issue/#289

Fixes issue #289