fix meta crap once and for all
merged ch with master