resolves #187; move finish event to where it is garanteed fire