Fixed clip this for remote storage.