fixed GH-68 issue (thanks to Remi Collet)