Small tweak - see last commit for more details