Water Caves Generate floating water when intersecting with Caves

So what happens is that A Underwater cave tries to Generate A Cave with water right when A Normal Cave is Generating and they intersect and Generate both air pockets and water pockets. 

Easiest way to Replace this is to go on this seed: 1157934012 and walk up the little hill on the island into the cave, There should be floating water right there Intill updated by a block