this may resolve issue #20