Todo added for #38