Fix #397