Fix crazy overnesting