Fix handling of mystery fish