Yet. Another. Fix.