Fix shared messages bug