Fix bug substitute $ case