Fixed #1285 and #1269.