fixed regression for previous changes