Close #32 - To be tested