Patch to 0.0.4