Fix for issue #200