Updated to v2.1.2