Another commit improving prev-commit bug fix