missing edits from #505