Patch for src/statement.cpp