Fixes API current code