Fixed #32