Fixed access-violation in fish... Reported upstream but I wanted my new fish