Fix and an example impl