Fixed missing variables