shouldn't this be handled at the config level?