Fixed #42. See previous commit