fixing up weird cases