DS-84 - Bug fixed