fix typo
add fish port by mariuszs (commit 9e55d5f)
backport changes from branch time24 to fish