Internal API usage fix