Fixed #42