Added fix for height issues.