- Fix weak typign