attempting to fix bidir diffing issues