Fix delayed messages