First fix for issue #43.