cleaning and fix of the 16th bit treatment