Fixed issue with redundant end notification