Fix #244