We believe this issue may be fixed in the latest Release Candidate for 6.21. Please give it a try and let us know.