fix continued for #381