Fixed #32
.