Patch broken commit for 0.3.5