fixed storage path handling