Do we really need this here? It seems to be called twice in case of platform add