v1.0.4 fixes