changed resolver logic