Duify once again

Change-Id: I0795b6c6907c9e59c99694a7ad04c4a20c19f5c6