Yet another fix for silly APIs