Fix bug
V1.1