Avoid #382