fix some false-pos