removed mutate that removed @message, as this breaks everything