Actually merge #379