Fixed #473