Yet another tweak