Fix for issue #222.