moar nasty single casing to fully close  #25