Fix bug with colliding frames