addresses issue #171