Account for Hyhy's professionalism in some edge cases

iceiceice said not to, but I think he's wrong