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