Make compatible with 2.7.1