#545 trying to make @paullewis happy