Fixed legacy style calls