fix and extend last commit