Fixed "null" issue on FinalState