fix for bug https://issues.infn.it/browse/CREAM-84