Slightly cleaner fix