Still a problem in production for messages