AUI-967 Fix SF issue