Patch tornado 4.0 compat