fixing resolve