Make sure side-data is merged until a proper solution is implemented