Working API binding.
Merge fix.