fixing issue #29