[FOLD] Propertystream Fix