Fixed the attr assignments