This line may be as first one of this method as it was previously. 
Now it is in both `if...else` cases