Fixed API issue