corrected state handling