Use stefanct's fork