Make mutation a little bit better