Fix and move back to u16