Tweak to recommended API so we don't need to call it all the time