added the original check back for attributes as it was