SC-85 Fix and test