2038 & 2078 Flatback Hot Fix