added #472 and #473