closed #1260, closed #1261