Fixed completion notification when firing