recurring activities computation handle special case in a better way