added #622, #920, and #957