Again maybe a config setting?