Fix #387