fix for STOR-562