* Fix regression caused by droggies 'minor changes' II