fix for remote storage