fix some bad cases