Fixed collision (I hope!)