fix by Fabrizio Curcio