Fix embed map scenario