Fsdss-673 Fixed -