Bug fix

Change-Id: I0b525e962925dba8d8ad0944a0096275ac643247