This should be on by default ...