Resolved #38