multi-sessions working

Signed-off-by: Julien Desfossez <jdesfossez@efficios.com>