patching issue #29 :smile: