Address @levibostian's concerns for #800