Fixed Implementation

Signed-off-by: Da Xue <dxue@vidyo.com>