hopefully removed session clash for logged-in users