merge fix for bug 1018387 from  ncdc