Only change the height, if it's larger than specified in CSS. Goes with #1588