Fix #391