bug fix in state using delivery address