#310 and #1030