Properties bugfix