Change to setting the correct flag