[#303] fixed all collision issues following last commit