Make it compatible with tornado4.0