Enable workaround and 8888