fixed regression, see diff