fixed compatiblity with 1.7.10