Final fix for issue #4.