Added debug stuff (found issue, fixing after dinner)