Final fix for issue #13.