try to resolve issue #20