fixed stackoverflow lik