Wouldn't it be nicer if a user could configure this to be true or false instead of hard coded ? ( same for the other commit )