API change needs to be fixed here