Fix for issue #159.