Fixed API regression