Last modification from oh-my-fish repo