eskimo-260716-fix