Conformation fix