-fixing for current API