ONGOING fix attempts