Small fix to issue #16