Fixed #41