Final fix to issue #8