added self healing code to avoid messages to pile up
update