Fixed the change listeners