Fixing
Merge with fixed sizes in Master