Fix and close #100