Quick fix to v2 API