Tentative fix for STOR-694