totoro: more fix