#92 Don't change status to stopped when saving