Patch from @krevidindiou close #140