issue-119: api issue