Initial fix for STOR-604.