Updated patch to support 0.95