Same fix but change place it's applied