also fix other var