Trying to make --no-ff work always