HPSA-48: Bug fixed