Fix for http://root.cern.ch/phpBB3/viewtopic.php?t=15886