Fixed small property set edge case