Bug fix

Change-Id: I3033691b02bdc9d4aa4fb38f51467261bcf5d30d