First attempt to fix API widgets problem