Fix suspended logic