CFY-620 now correctly handling it