Fixed issue on logout