Fixed ANOTHER deprecated api implementation