Fix #473