Improve Wondex decoder