Fix #404