FIX: HasProperties set should not modify inputs