Fix bug
Merge