Tentative fix for STOR-651