Fixed for scm2454