Fixed with version from master

Change-Id: I13ec3c001766a6659278cca7ceda2f6ae4a823b2