FIxed cases
Merge