i38: closes #38