fixed non-same-usename bug (I think)