Make sure compatible with tilt-2.x