Fixes for issue #288

Fixes issue #288