Fixed things for weird cases