fix #1 and fix .w50