Fix and close #11