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