working on messages bug