change: fixed stackoverflow bug