Concerning #746: Attempted fix