[#233] Fix slug collision avoidance