fixing potential concurrency issues in suspend state