removed redundant resolve