Silly bug found, close #16