small modification from last GitHub patch by Jordi Tudela
- thanks for sharing!