- And make #297 happy