bugfix with property listeners