fix some regressions from recent changes
send 2 firs to make sure it works