Minor tweak to the last commit to make it actually work...