Fix #406