More logging and commented out fix (?!)