Bug fix with multi-users