Mutation bug fix