bug/1272766 fix chains again

Change-Id: Ia21f6b9afd230586e81fe30d323d403b4d46dcb2