compat with later tornado versions