Forgot to change subtype to "null" when null.