Cleaner fix for issue 4970?