fixed incompatibility to API > 20101