Fix and test previous commit