Hopefully fix bug #6079