possible fix for issue #29