fix for STOR-564