Fix #410