merge fix for #243