Cleaned up fix for unsampled states