Fix ValueResolver