#405 Fixed incorrect replacement