fixed weird behaviour with other users