More debug
More debug, temp fix.