fixed resolve