Fixing api2