overlap fixes