Mutation fix