revc + core fix