Fixing special handling of presence type in the model