Resolve issue #25