Fix: Messages are not overritten