Close #260 and #276.