might fix the double logging off msg...