keep-running issue addressed