Fixed pre-release 8.1