Minor - added height out of bounds checks