Fixing state check