tried to resolve issue #25