try to resolve issue #23