bugfix for api compatible