Updated to v1.2.16