IC2 compatibility - workaround for storage issue.  Fixes #383