Working on fixing the attribute bug