Updated with v2.6.1.4