another fix, with support from Marco