Fix minor logic.
But need to discuss API naming with AJ.