Slightly better behaviour on push-back