Yet another tweak to see if it works