Add override for SCM fix