Added a workaround subnet lookup