Fix #40 issue