fixed is_final issue