Properties 2.0 fix