fix the fixes for the tims fixes