The "fix" is very weird (see VariableState.cpp:55 and following) and still seems to lead to a segfault upon program termination...