maybe put this behind the config option too?