Was there a solution to this? It is currently also calculating it for non resident, but not for resident.
