Fixed GMS-64 issue

GMS-64

Signed-off-by: Kulamagal Mahendrarajah <kulamagal@qi-interactive.com>