Incorporate change from alain91 in issue #48