Backward compatibility with 3.x