#1 - Fix api method bug