Fix bloody message shizzle