Resolve issue #18