Fix SC
Fix conflict, hope it works