Tweak code a little