Cleaner fix.