Fixed BC break introduced by adding OptionsResolver