Patch to solve #87