Type fix, and substr for first char removed