fixed throwing issue