Fix bug on v1.0.8