Fix #101 for master branch