updated for 3.1.2.342