fixing [rfced] issues