Attempted fix for build break 2