fix for bug 1170159

Change-Id: Ie9b265a7b2864af8233dae5399b66b3658d125f6