fix messaging