Applying hotfix for #120 - degrades performance, but fixes the mistake for various different possible API calls