Updated to v1.8.2