Add flip vector as a temporary measure until we figure out why it fails under some circumstances