Bug fix: https://savannah.cern.ch/bugs/index.php?101104
v1.6.1