Fix and test #16