Concerning #753: Attempted fix