Attempt at logout fix