Do the same check for height being non-0 before we set it.