Improving 4fa2b07172edbd5ca1b369802494737efd71d689