v0.6.1 Patch