Updated with latest 1.3.10