add a bit more elem capture (needs tests)