add fix from devel into multi-user project