Fixed #40