fix replacing key. remove _ from key