fixed bug with removePropertyChangeListener