Ssni-995 Fix Info