Fixed github issue

Change-Id: Ifa36f8fe054f7827efc9273fd9640f7373e91626