v1.8.0 fixed