Added messageFactory after wrong deletion