Fix the fix; remove #attribute?