Fix a bug
Merge