Fixed old API usage