Typo fix. Actually closes #1238 and #1243.