Use workaround for pending tabs in API too
(ref: #7)