Important change so previous fix work with attr