Remove additional finish event triggering fixes #242