Fix #560 - Changed the finish to an after LATE_EVENT
Fix #560 - Changed the finish to an after LATE_EVENT