WFCR - fixed bugs