Fix for issue #43.