should address issue #120, and issue #122