Fix #408