Sessions, fixes #502