Fix bug in cleanup of runner