Fix for issue #27.