Finalizes #38