Fix for issue #25.