commit to show to caribou what i meant, it may actually broke something, check the check for nullness