temporary fix for replace until master version is fixed