Refactor #3370: Correction of Fixed Height and Fixed Width behavior