[FIX] Missing attribute after merge re-added