Fix for making it compatible with all storages