Attempted fix for 5.3.3.