Fixed throwging bug