Resolve issue #24