fixed ugly stuff