Replace messed up again

Need to really find a better way!