Tweak of previous commit