More debug and a potential fix