Fixed resolve signature