fixed listener initialising states to not re-write not-null data