Fix replace calls