Fsdss-536 - Fix