[WIP] PropertyStream fix