replace join with resolve