bugfix - keep_going never set to true