PIM-3530 : fix attributes scenario