Fixed patch resolving statements