This should address issue #192

issue #192 fix