Fixed Storm messaging