Fix error introduced by last commit and REALLY close #41