Fix #418