Fixed v1.3.0