Quick fix for issue #200
Fixes issue #200