Improved fix.