Oops, that was important after all (bugfix+futureproof)