Fixed minor bug
Merging