Fix a bug
Merge branch 'implement'