Fixed API and controller