Attempt a fix at an API bug