Removed bug
Merge