merge fix for #2924 to trunk