quickfix for bug #6280