Fix of collission handler