Fix needed because of this commit: 1835608f2c7632a9b8ee4c735f922d8434722e0b Change-Id: Ia061d450e72f3d40eb339cb3c832750ab5238014