STORAGEMODEL-301 a better workaround