Minor bugfix

Change-Id: I195eb01c1a6d27d8fca78d61ee0c58cc354ccb38