Fixed collision errors