dirty workaround for bad session management