Slightly cleaner fix.