Corrected current compare layout