updated for 2.1.2 support