Move the boolean setting to a better location