fix to issue #29
fix to issue #29