Fixed a bug that shows up under 6.15