Re-order to avoid stupid none type check.