Fixed issue with stopped handler