Workaround for bug 942290?