Fix for null heights/weights