Fixed bug with colliding name