state in condition issue temporary fix