fix hybrid expr state restore bug (in progress)