Towards a fix for STOR-459