v1.1 fixes