updated to 6.4-m12