Update for v1.1.8