Fix for bug 1834.

Change-Id: Idf4b8698d23adc9368d98469f7cbcdb3d46637e1
Signed-off-by: Alex Fan <railor33@gmail.com>