Fix Bug 2291

Change-Id: Ie86cd6f61648aefc81c80c53866e2421216cd111
Signed-off-by: Loi Pan <mr.loipan@gmail.com>