Improved fix for core John.