This bit should be moved up as line 1561 above seems to contradict.