Small enhancement to last commit