Another attempt to fix the failure in #204