Fix #381