Fix #468