API issue fix