Fix issue #2191.

Signed-off-by: Edwin Aw <tkaw220@gmail.com>
Merge pull request #2192 from tkaw220/develop

Fix issue #2191.