Charles, will there be a fix for this before 6.2.1?