Preliminary fix for elementPropertyWatcher.