Quick bug fix

Change-Id: Ic1f56eacc5d70d3dcd6bae1ba7d10b3ab2b76802