Fix issue with expired sessions