attempt to resolve issue #148 and #220