Trying to fix for new API