Added some debug, trying to correct data assignement.