FIX: Still listen to changes when fails.