Def hr fixes - fix #91

#91 is still preventing us from using marked, we'd love to use marked, but can't until #91 is fixed