Tweak the code a bit.