1.4.7 fix and recode