fixed ugly syntax