addresses issue #180