try to resolve issue 94