Fix for issue #191.