Fix feature mapping