Fixes Fixed

A fix to fix the fixes that we thought were fixed but were actually not fixed.