change to be compatible with 3.1