Added temporary workaround for handlers that are not cleaned up properly
until the source of the issue can be fixed.