#4496 oracle fix