Fixed Bugs
Merge Fix