I think we should still guard this shouldn't we? i.e. leave this line in?