Remove initialization, check for null in calculation to prevent recursive glitch