- adapted to libstorage change