Lot of fix, fix bug witch destroy source