Fix for issue #221