Resolve issue #17