Switch to sticky-ends, HT @somakrdas