My fish pull request - Laure Fischer