Fix for issue #4.