Improved indeterminate state handling