Changes for issue #29