2.7 compatiblity update