gluing fixes